Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 21 Sep 2011 00:47:29 +0000 (17:47 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 21 Sep 2011 00:47:29 +0000 (17:47 -0700)
commit6b4f280f572d7341144f2a19e24f224d41342587
tree4af8abb50d4137f53182e6716098f610bd215e1c
parent206613f85758ac841eaac1bb27ac45a661c5132f
parentf666f3080cb3853b2d3c041ec31bff898ea53f1e
Merge from trunk.